Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 20 Mar 2006 08:56:54 +0000 (09:56 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 20 Mar 2006 08:56:54 +0000 (09:56 +0100)

Trivial merge